Add an auxiliary ident parsing function

This lets us conveniently create ident values from
multiple candidates.

diff --git a/gtk/gtkcssstringvalue.c b/gtk/gtkcssstringvalue.c
index c12eb7661bcd5bb4ebd66b6e8cbff657fbe3382c..ad29def9a13b34897fd67cb45be9ad80f4b01631 100644 (file)
--- a/gtk/gtkcssstringvalue.c
+++ b/gtk/gtkcssstringvalue.c
@@ -203,6 +203,34 @@ _gtk_css_ident_value_try_parse (GtkCssParser *parser)
   return _gtk_css_ident_value_new_take (ident);
 }
 
+GtkCssValue *
+_gtk_css_ident_value_try (GtkCssParser *parser,
+                          const char   *ident,
+                          ...)
+{
+  va_list args;
+  const char *name;
+  GtkCssValue *value = NULL;
+
+  name = ident;
+
+  va_start (args, ident);
+
+  while (name)
+    {
+      if (_gtk_css_parser_try (parser, name, TRUE))
+        {
+          value = _gtk_css_ident_value_new (name);
+          break;
+        }
+      ident = va_arg (args, const char *);
+    }
+
+  va_end (args);
+
+  return value;
+}
+
 const char *
 _gtk_css_ident_value_get (const GtkCssValue *value)
 {

diff --git a/gtk/gtkcssstringvalueprivate.h b/gtk/gtkcssstringvalueprivate.h
index 5fb703b6e3b5f8f5b38df01cb5b2134dd6391e2a..0aaa9ec8af6e377d1100231f1150223d14cb7027 100644 (file)
--- a/gtk/gtkcssstringvalueprivate.h
+++ b/gtk/gtkcssstringvalueprivate.h
@@ -29,6 +29,9 @@ G_BEGIN_DECLS
 GtkCssValue *   _gtk_css_ident_value_new            (const char             *ident);
 GtkCssValue *   _gtk_css_ident_value_new_take       (char                   *ident);
 GtkCssValue *   _gtk_css_ident_value_try_parse      (GtkCssParser           *parser);
+GtkCssValue *   _gtk_css_ident_value_try            (GtkCssParser           *parser,
+                                                     const char             *ident,
+                                                     ...);
 
 const char *    _gtk_css_ident_value_get            (const GtkCssValue      *ident);